Don't use bundled fonts
authorAlex Crichton <alex@alexcrichton.com>
Tue, 2 Sep 2014 17:30:20 +0000 (10:30 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 2 Sep 2014 17:51:36 +0000 (10:51 -0700)
src/doc/mkfonts.rb [deleted file]
src/doc/source/stylesheets/all.css.scss
src/doc/source/stylesheets/fonts.css.scss
src/doc/woffify.rb [deleted file]

diff --git a/src/doc/mkfonts.rb b/src/doc/mkfonts.rb
deleted file mode 100644 (file)
index deb5ce4..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-require "erb"
-
-def font(url, family, weight: weight, italic: italic)
-  url = "../fonts/#{url}.woff"
-
-  erb = ERB.new(<<-HERE.gsub(/^    /, ""), nil, "-")
-    @font-face {
-      src: url("#{url}");
-      font-family: "<%= family %>";
-      <%- if weight -%>
-      font-weight: <%= weight %>;
-      <%- end -%>
-      <%- if italic -%>
-      font-style: italic;
-      <%- end -%>
-    }
-
-  HERE
-
-  erb.result(binding)
-end
-
-File.open("source/stylesheets/fonts.css.scss", "w") do |file|
-  file.puts font("Consolas", "Consolas")
-  file.puts font("Consolas-Bold", "Consolas", weight: "bold")
-  file.puts font("Consolas-Italic", "Consolas", italic: true)
-  file.puts font("Consolas-Bold-Italic", "Consolas", weight: "bold", italic: true)
-
-  file.puts font("Roboto/Roboto-Thin", "Roboto", weight: 100)
-  file.puts font("Roboto/Roboto-Light", "Roboto", weight: 200)
-  file.puts font("Roboto/Roboto-Regular", "Roboto", weight: 400)
-  file.puts font("Roboto/Roboto-Medium", "Roboto", weight: 500)
-  file.puts font("Roboto/Roboto-Bold", "Roboto", weight: 700)
-  file.puts font("Roboto/Roboto-Black", "Roboto", weight: 800)
-end
index bee95862ed5a70c5392cb051c00fa8a5bf7c6246..6e8b9fdd41ac5a918ddcd594be31c520a4eeb8b0 100644 (file)
@@ -11,11 +11,12 @@ html {
 }
 
 pre {
-  font-family: "Consolas";
+  font-family: monospace;
+  font-size: 110%;
 }
 
 body {
-  font-family: "Roboto";
+  font-family: sans-serif;
 }
 
 * {
@@ -70,7 +71,8 @@ h2 {
 }
 
 code:not(.highlight) {
-  font-family: Consolas;
+  font-family: monospace;
+  font-size: 110%;
   color: $purple;
 }
 
index d65b3d2cedb1f72366a5195064ad8c8e64e2d2fe..09709a4545983ddc096653e88e37921633605c3b 100644 (file)
@@ -1,39 +1 @@
 @import "compass/css3";
-
-@include font-face("Consolas", inline-font-files("Consolas.woff", woff), $weight: 400);
-@include font-face("Consolas", inline-font-files("Consolas-Bold.woff", woff), $weight: 700);
-@include font-face("Roboto", inline-font-files("Roboto/Roboto-Regular.woff", woff), $weight: 400);
-@include font-face("Roboto", inline-font-files("Roboto/Roboto-Bold.woff", woff), $weight: 700);
-@include font-face("Roboto", inline-font-files("Roboto/Roboto-Medium.woff", woff), $weight: 500);
-
-@font-face {
-  src: url("../fonts/Consolas-Italic.woff");
-  font-family: "Consolas";
-  font-style: italic;
-}
-
-@font-face {
-  src: url("../fonts/Consolas-Bold-Italic.woff");
-  font-family: "Consolas";
-  font-weight: bold;
-  font-style: italic;
-}
-
-@font-face {
-  src: url("../fonts/Roboto/Roboto-Thin.woff");
-  font-family: "Roboto";
-  font-weight: 100;
-}
-
-@font-face {
-  src: url("../fonts/Roboto/Roboto-Light.woff");
-  font-family: "Roboto";
-  font-weight: 200;
-}
-
-@font-face {
-  src: url("../fonts/Roboto/Roboto-Black.woff");
-  font-family: "Roboto";
-  font-weight: 800;
-}
-
diff --git a/src/doc/woffify.rb b/src/doc/woffify.rb
deleted file mode 100644 (file)
index 33c9076..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-require "fileutils"
-
-FileUtils.rm Dir["source/fonts/**/*.woff"]
-
-Dir["source/fonts/**/*.ttf"].each do |file|
-  out = file.sub(/\.ttf$/, ".woff").gsub(' ', "-")
-  puts "Converting `#{file}` to `#{out}`"
-  `~/npm/bin/ttf2woff "#{file}" "#{out}"`
-end